From: nana-4 <hnmaigo@gmail.com>
Date: Thu, 6 Feb 2020 13:08:33 +0000 (+0900)
Subject: theme/calendar: Don't nest all card styles for code consistency
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~3
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dbf1ffc9d47ee9fba907df1cdfb334654d3b7fba;p=gnome-shell.git

theme/calendar: Don't nest all card styles for code consistency

The inconsistent styling rules "some card styles are nested, but some
are not" and "some card styles are nested, but some of their descendant
styles are defined elsewhere" are very confusing.

This commit stops nesting all card styles to make the coding style
consistent and less confusing.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/957
---

diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss b/data/theme/gnome-shell-sass/widgets/_calendar.scss
index eba91b631..79b2784fb 100644
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -16,44 +16,11 @@
   &:ltr {margin-right: $base_margin * 2; border-left-width: 1px; }
   &:rtl {margin-left: $base_margin * 2; border-right-width: 1px; }
 
-  // today button (the date)
-  .datemenu-today-button {
-    @include notification_bubble($flat: true);
-    padding: $base_padding * 1.5;
-
-    // weekday label
-    .day-label {
-      @include fontsize($base_font_size+1);
-      font-weight: bold;
-    }
-
-    // date label
-    .date-label {
-      @include fontsize($base_font_size+7);
-      font-weight: 1000;
-    }
-  }
-
-  // calendar
-  .calendar {
-    @include notification_bubble;
-    padding: $base_padding;
-
-    // more below for sub-elements
-  }
-
   .datemenu-displays-section {
   }
 
   .datemenu-displays-box {
     spacing: $base_spacing;
-
-    // world clocks and weather
-    .world-clocks-button,
-    .weather-button {
-      @include notification_bubble;
-      padding: $base_padding;
-    }
   }
 }
 
@@ -64,8 +31,28 @@
   padding: .4em;
 }
 
+/* today button (the date) */
+.datemenu-today-button {
+  @include notification_bubble($flat: true);
+  padding: $base_padding * 1.5;
+
+  // weekday label
+  .day-label {
+    @include fontsize($base_font_size+1);
+    font-weight: bold;
+  }
+
+  // date label
+  .date-label {
+    @include fontsize($base_font_size+7);
+    font-weight: 1000;
+  }
+}
+
 /* Calendar */
 .calendar {
+  @include notification_bubble;
+  padding: $base_padding;
 
   // month
   .calendar-month-label {
@@ -183,9 +170,13 @@
 
 
 /* Weather */
-.weather-box {
-  spacing: $base_spacing + $base_margin;
-  padding:$base_padding;
+.weather-button {
+  @include notification_bubble;
+  padding: $base_padding * 2;
+
+  .weather-box {
+    spacing: $base_spacing + $base_margin;
+  }
 
   .weather-header {
     color: desaturate(darken($fg_color,40%), 10%);
@@ -221,10 +212,14 @@
 }
 
 /* World clocks */
-.world-clocks-grid {
-  padding:$base_padding;
-  spacing-rows: $base_spacing;
-  spacing-columns: $base_spacing * 2;
+.world-clocks-button {
+  @include notification_bubble;
+  padding: $base_padding * 2;
+
+  .world-clocks-grid {
+    spacing-rows: $base_spacing;
+    spacing-columns: $base_spacing * 2;
+  }
 
   // title
   .world-clocks-header {